ERA-11397 & ERA-11399 #1290
Merged
ERA-11397 & ERA-11399 #1290
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…shown in collections
luixlive
commented
May 7, 2025
| @@ -31,10 +28,6 @@ const ContainedReportListItem = ({ cardsExpanded, onCollapse, onExpand, report } | |||
| const { t } = useTranslation('details-view', { keyPrefix: 'containedReportListItem' }); | |||
|
|
|||
| const reportFromEventStore = useSelector((state) => state.data.eventStore[report.id]); | |||
| const eventSchema = useSelector((state) => reportFromEventStore | |||
There was a problem hiding this comment.
The purpose of all the logic removed here was only to render the form summary, so it didn't make sense to keep it here. I moved it to the ReportFormSummary component keeping the parent (this component) cleaner.
luixlive
commented
May 7, 2025
| @@ -0,0 +1,56 @@ | |||
| import React, { useMemo } from 'react'; | |||
There was a problem hiding this comment.
I decided to divide (and conquer) the ReportFormSummary component into 3 parts:
- The event details that are not part of the schema (reported by, priority, location, date...) those are rendered by the parent component.
- The form summary for v1 schemas are rendered here.
- And the form summary for v2 schemas also have their own file now 👍
luixlive
commented
May 7, 2025
| @@ -1,42 +1 @@ | |||
| export const CHOICE_LIST_ELEMENT_CHOICE_TYPES = { | |||
There was a problem hiding this comment.
Several utilities that used to be only used by the SchemaForm are now used by the ReportFormSummary so it made sense to extract them to a more general utils folder.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
How does it look
Saved event with a complex v2 schema showing the form summary inside a collection:
Relevant link(s)
Any background context you want to provide(if applicable)
After Ernesto's fix to support storing events with our new schema format, events were saved successfully without having to do further changes to the saving flow. However, when fetching stored events that belong in a collection, the event form summary wasn't rendering properly because we never added support to v2 schemas there. All changes in this PR are related to that.